Show More
@@ -1946,7 +1946,7 b' def applybindelta(binchunk, data):' | |||||
1946 | """ |
|
1946 | """ | |
1947 | def deltahead(binchunk): |
|
1947 | def deltahead(binchunk): | |
1948 | i = 0 |
|
1948 | i = 0 | |
1949 | for c in binchunk: |
|
1949 | for c in pycompat.bytestr(binchunk): | |
1950 | i += 1 |
|
1950 | i += 1 | |
1951 | if not (ord(c) & 0x80): |
|
1951 | if not (ord(c) & 0x80): | |
1952 | return i |
|
1952 | return i |
@@ -253,7 +253,8 b' def _scantemplate(tmpl, start, stop, quo' | |||||
253 | p = parser.parser(elements) |
|
253 | p = parser.parser(elements) | |
254 | try: |
|
254 | try: | |
255 | while pos < stop: |
|
255 | while pos < stop: | |
256 |
n = min((tmpl.find(c, pos, stop) |
|
256 | n = min((tmpl.find(c, pos, stop) | |
|
257 | for c in pycompat.bytestr(sepchars)), | |||
257 | key=lambda n: (n < 0, n)) |
|
258 | key=lambda n: (n < 0, n)) | |
258 | if n < 0: |
|
259 | if n < 0: | |
259 | yield ('string', unescape(tmpl[pos:stop]), pos) |
|
260 | yield ('string', unescape(tmpl[pos:stop]), pos) |
General Comments 0
You need to be logged in to leave comments.
Login now