This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12338

py3: use int instead of pycompat.long
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG176f1a0d15dc: py3: use int instead of pycompat.long
Summary

pycompat.long is aliased to int. So this should have no change in
functionality.

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

indygreg created this revision.Mar 3 2022, 10:30 PM
Alphare accepted this revision.Mar 8 2022, 4:31 AM
This revision is now accepted and ready to land.Mar 8 2022, 4:31 AM
indygreg added a commit: rHG176f1a0d15dc: py3: use int instead of pycompat.long.Mar 8 2022, 6:00 AM
Closed by commit rHG176f1a0d15dc: py3: use int instead of pycompat.long (authored by indygreg). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 32590

hgext/convert/monotone.py

read = None read = None
lengthstr = b'' lengthstr = b''
while read != b':': while read != b':':
read = self.mtnreadfp.read(1) read = self.mtnreadfp.read(1)
if not read: if not read:
raise error.Abort(_(b'bad mtn packet - no end of packet size')) raise error.Abort(_(b'bad mtn packet - no end of packet size'))
lengthstr += read lengthstr += read
try: try:
length = pycompat.long(lengthstr[:-1]) length = int(lengthstr[:-1])
except TypeError: except TypeError:
raise error.Abort( raise error.Abort(
_(b'bad mtn packet - bad packet size %s') % lengthstr _(b'bad mtn packet - bad packet size %s') % lengthstr
) )
read = self.mtnreadfp.read(length) read = self.mtnreadfp.read(length)
if len(read) != length: if len(read) != length:
raise error.Abort( raise error.Abort(

hgext/remotefilelog/shallowutil.py

metabuf += struct.pack(b'!H', len(v)) metabuf += struct.pack(b'!H', len(v))
metabuf += v metabuf += v
# len(metabuf) is guaranteed representable in 4 bytes, because there are # len(metabuf) is guaranteed representable in 4 bytes, because there are
# only 256 keys, and for each value, len(value) <= 0xfffe. # only 256 keys, and for each value, len(value) <= 0xfffe.
return metabuf return metabuf
_metaitemtypes = { _metaitemtypes = {
constants.METAKEYFLAG: (int, pycompat.long), constants.METAKEYFLAG: (int, int),
constants.METAKEYSIZE: (int, pycompat.long), constants.METAKEYSIZE: (int, int),
} }
def buildpackmeta(metadict): def buildpackmeta(metadict):
"""like _buildpackmeta, but typechecks metadict and normalize it. """like _buildpackmeta, but typechecks metadict and normalize it.
This means, METAKEYSIZE and METAKEYSIZE should have integers as values, This means, METAKEYSIZE and METAKEYSIZE should have integers as values,
and METAKEYFLAG will be dropped if its value is 0. and METAKEYFLAG will be dropped if its value is 0.

mercurial/formatter.py

def isprintable(obj): def isprintable(obj):
"""Check if the given object can be directly passed in to formatter's """Check if the given object can be directly passed in to formatter's
write() and data() functions write() and data() functions
Returns False if the object is unsupported or must be pre-processed by Returns False if the object is unsupported or must be pre-processed by
formatdate(), formatdict(), or formatlist(). formatdate(), formatdict(), or formatlist().
""" """
return isinstance(obj, (type(None), bool, int, pycompat.long, float, bytes)) return isinstance(obj, (type(None), bool, int, int, float, bytes))
class _nullconverter(object): class _nullconverter(object):
'''convert non-primitive data types to be processed by formatter''' '''convert non-primitive data types to be processed by formatter'''
# set to True if context object should be stored as item # set to True if context object should be stored as item
storecontext = False storecontext = False

mercurial/templatefilters.py

def json(obj, paranoid=True): def json(obj, paranoid=True):
"""Any object. Serializes the object to a JSON formatted text.""" """Any object. Serializes the object to a JSON formatted text."""
if obj is None: if obj is None:
return b'null' return b'null'
elif obj is False: elif obj is False:
return b'false' return b'false'
elif obj is True: elif obj is True:
return b'true' return b'true'
elif isinstance(obj, (int, pycompat.long, float)): elif isinstance(obj, (int, int, float)):
return pycompat.bytestr(obj) return pycompat.bytestr(obj)
elif isinstance(obj, bytes): elif isinstance(obj, bytes):
return b'"%s"' % encoding.jsonescape(obj, paranoid=paranoid) return b'"%s"' % encoding.jsonescape(obj, paranoid=paranoid)
elif isinstance(obj, type(u'')): elif isinstance(obj, type(u'')):
raise error.ProgrammingError( raise error.ProgrammingError(
b'Mercurial only does output with bytes: %r' % obj b'Mercurial only does output with bytes: %r' % obj
) )
elif util.safehasattr(obj, b'keys'): elif util.safehasattr(obj, b'keys'):

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 import sys
from .. import pycompat
# 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.
# #
# Most types have lengths. However, bytestring, string, array, and map # Most types have lengths. However, bytestring, string, array, and map
def streamencodenone(v): def streamencodenone(v):
# major type 7, simple value 22. # major type 7, simple value 22.
yield b'\xf6' yield b'\xf6'
STREAM_ENCODERS = { STREAM_ENCODERS = {
bytes: streamencodebytestring, bytes: streamencodebytestring,
int: streamencodeint, int: streamencodeint,
pycompat.long: streamencodeint, int: streamencodeint,
list: streamencodearray, list: streamencodearray,
tuple: streamencodearray, tuple: streamencodearray,
dict: streamencodemap, dict: streamencodemap,
set: streamencodeset, set: streamencodeset,
bool: streamencodebool, bool: streamencodebool,
type(None): streamencodenone, type(None): streamencodenone,
} }