This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2072

py3: use pycompat.bytestr to convert _b85chars to bytes
ClosedPublic

Authored by pulkit on Feb 7 2018, 4:01 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG01b4d88ccb24: py3: use pycompat.bytestr to convert _b85chars to bytes
Summary

The tranformer does append b'' to the value and make that a bytes but bytes in
Python 3 returns the ascii value on getting characters using indexing.
Characters of this string are queried using indexing multiple times in the file
and to support that we use pycompat.bytestr which returns the bytechrs using
indexing.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

pulkit created this revision.Feb 7 2018, 4:01 AM
durin42 accepted this revision.Feb 7 2018, 6:14 AM
This revision is now accepted and ready to land.Feb 7 2018, 6:14 AM
Closed by commit rHG01b4d88ccb24: py3: use pycompat.bytestr to convert _b85chars to bytes (authored by pulkit). · Explain WhyFeb 7 2018, 6:22 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/pure/base85.py (6 lines)

Diff 5286

mercurial/pure/base85.py

# base85.py: pure python base85 codec # base85.py: pure python base85 codec
# #
# Copyright (C) 2009 Brendan Cully <brendan@kublai.com> # Copyright (C) 2009 Brendan Cully <brendan@kublai.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import struct import struct
_b85chars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ" \ from .. import pycompat
"abcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~"
_b85chars = pycompat.bytestr("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdef"
"ghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~")
_b85chars2 = [(a + b) for a in _b85chars for b in _b85chars] _b85chars2 = [(a + b) for a in _b85chars for b in _b85chars]
_b85dec = {} _b85dec = {}
def _mkb85dec(): def _mkb85dec():
for i, c in enumerate(_b85chars): for i, c in enumerate(_b85chars):
_b85dec[c] = i _b85dec[c] = i
def b85encode(text, pad=False): def b85encode(text, pad=False):