##// END OF EJS Templates
py3: use bytes in place of basestring...
Pulkit Goyal -
r35198:bfd072c5 default
parent child Browse files
Show More
@@ -450,7 +450,7 b' class converter(object):'
450 commit = self.commitcache[rev]
450 commit = self.commitcache[rev]
451 full = self.opts.get('full')
451 full = self.opts.get('full')
452 changes = self.source.getchanges(rev, full)
452 changes = self.source.getchanges(rev, full)
453 if isinstance(changes, basestring):
453 if isinstance(changes, bytes):
454 if changes == SKIPREV:
454 if changes == SKIPREV:
455 dest = SKIPREV
455 dest = SKIPREV
456 else:
456 else:
@@ -3722,7 +3722,7 b' def revert(ui, repo, ctx, parents, *pats'
3722 else:
3722 else:
3723 util.rename(target, bakname)
3723 util.rename(target, bakname)
3724 if ui.verbose or not exact:
3724 if ui.verbose or not exact:
3725 if not isinstance(msg, basestring):
3725 if not isinstance(msg, bytes):
3726 msg = msg(abs)
3726 msg = msg(abs)
3727 ui.status(msg % rel)
3727 ui.status(msg % rel)
3728 elif exact:
3728 elif exact:
@@ -222,7 +222,7 b' class httppeer(wireproto.wirepeer):'
222 if not data:
222 if not data:
223 data = strargs
223 data = strargs
224 else:
224 else:
225 if isinstance(data, basestring):
225 if isinstance(data, bytes):
226 i = io.BytesIO(data)
226 i = io.BytesIO(data)
227 i.length = len(data)
227 i.length = len(data)
228 data = i
228 data = i
General Comments 0
You need to be logged in to leave comments. Login now