This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5698

wireprotov2peer: rewrite character traversal to use slices
ClosedPublic

Authored by indygreg on Jan 25 2019, 7:01 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGe6c1c6478d04: wireprotov2peer: rewrite character traversal to use slices
rHGe269ae40b551: wireprotov2peer: rewrite character traversal to use slices
Summary

Otherwise on Python 3 we iterate over integers instead of a
bytes instance and the comparison fails.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Jan 25 2019, 7:01 PM
Closed by commit rHGe269ae40b551: wireprotov2peer: rewrite character traversal to use slices (authored by indygreg). · Explain WhyJan 25 2019, 9:17 PM
This revision was automatically updated to reflect the committed changes.
yuja added a subscriber: yuja.Jan 25 2019, 11:21 PM

+ mercurial/wireprotov2peer.py:307:
+ > self._ui.debug(_('received %r\n') % frame)
+ don't mark debug messages for translation
+ mercurial/wireprotov2peer.py:513:
+ > return [True if raw[i:i+1] == b'1' else False for i in range(len(raw))]
+ missing whitespace in expression

yuja added a comment.Jan 26 2019, 2:10 AM
+  mercurial/wireprotov2peer.py:307:
+   >                 self._ui.debug(_('received %r\n') % frame)
+   don't mark debug messages for translation
+  mercurial/wireprotov2peer.py:513:
+   >     return [True if raw[i:i+1] == b'1' else False for i in range(len(raw))]
+   missing whitespace in expression

Fixed these as I had to rebase the changesets.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotov2peer.py (2 lines)

Diff 13467

mercurial/wireprotov2peer.py

def decodeheads(objs): def decodeheads(objs):
# Array of node bytestrings. # Array of node bytestrings.
return next(objs) return next(objs)
def decodeknown(objs): def decodeknown(objs):
# Bytestring where each byte is a 0 or 1. # Bytestring where each byte is a 0 or 1.
raw = next(objs) raw = next(objs)
return [True if c == '1' else False for c in raw] return [True if raw[i:i+1] == b'1' else False for i in range(len(raw))]
def decodelistkeys(objs): def decodelistkeys(objs):
# Map with bytestring keys and values. # Map with bytestring keys and values.
return next(objs) return next(objs)
def decodelookup(objs): def decodelookup(objs):
return next(objs) return next(objs)