( )⚙ D12348 cborutil: remove Python 2 definition of _elementtointeger()

This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12348

cborutil: remove Python 2 definition of _elementtointeger()
ClosedPublic

Authored by indygreg on Mar 3 2022, 10:30 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGbce8f66d3045: cborutil: remove Python 2 definition of _elementtointeger()

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

indygreg created this revision.Mar 3 2022, 10:30 PM
Alphare accepted this revision.Mar 8 2022, 4:44 AM
This revision is now accepted and ready to land.Mar 8 2022, 4:44 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/utils/cborutil.py (13 lines)

Diff 32560

mercurial/utils/cborutil.py

# cborutil.py - CBOR extensions # cborutil.py - CBOR extensions
# #
# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com> # Copyright 2018 Gregory Szorc <gregory.szorc@gmail.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.
import struct import struct
import sys
# Very short very of RFC 7049... # Very short very of RFC 7049...
# #
# Each item begins with a byte. The 3 high bits of that byte denote the # Each item begins with a byte. The 3 high bits of that byte denote the
# "major type." The lower 5 bits denote the "subtype." Each major type # "major type." The lower 5 bits denote the "subtype." Each major type
# has its own encoding mechanism. # has its own encoding mechanism.
# #
return fn(v) return fn(v)
class CBORDecodeError(Exception): class CBORDecodeError(Exception):
"""Represents an error decoding CBOR.""" """Represents an error decoding CBOR."""
if sys.version_info.major >= 3:
def _elementtointeger(b, i): def _elementtointeger(b, i):
return b[i] return b[i]
else:
def _elementtointeger(b, i):
return ord(b[i])
STRUCT_BIG_UBYTE = struct.Struct('>B') STRUCT_BIG_UBYTE = struct.Struct('>B')
STRUCT_BIG_USHORT = struct.Struct(b'>H') STRUCT_BIG_USHORT = struct.Struct(b'>H')
STRUCT_BIG_ULONG = struct.Struct(b'>L') STRUCT_BIG_ULONG = struct.Struct(b'>L')
STRUCT_BIG_ULONGLONG = struct.Struct(b'>Q') STRUCT_BIG_ULONGLONG = struct.Struct(b'>Q')
SPECIAL_NONE = 0 SPECIAL_NONE = 0
SPECIAL_START_INDEFINITE_BYTESTRING = 1 SPECIAL_START_INDEFINITE_BYTESTRING = 1
SPECIAL_START_ARRAY = 2 SPECIAL_START_ARRAY = 2