mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-31 22:18:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Rip out 'long' and 'L'-suffixed integer literals.

Browse source 
(Rough first cut.)
This commit is contained in:
Guido van Rossum 2007-01-15 16:59:06 +00:00
parent fc7bb8c786
commit e2a383d062
146 changed files with 1446 additions and 1477 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Lib/pickle.py
View file

@ -898,7 +898,7 @@ class Unpickler:
try:
val = int(data)
except ValueError:
val = long(data)
val = int(data)
self.append(val)
dispatch[INT] = load_int
@ -915,7 +915,7 @@ class Unpickler:
dispatch[BININT2] = load_binint2
def load_long(self):
self.append(long(self.readline()[:-1], 0))
self.append(int(self.readline()[:-1], 0))
dispatch[LONG] = load_long
def load_long1(self):
@ -1239,22 +1239,22 @@ import binascii as _binascii
def encode_long(x):
r"""Encode a long to a two's complement little-endian binary string.
Note that 0L is a special case, returning an empty string, to save a
Note that 0 is a special case, returning an empty string, to save a
byte in the LONG1 pickling context.
>>> encode_long(0L)
>>> encode_long(0)
''
>>> encode_long(255L)
>>> encode_long(255)
'\xff\x00'
>>> encode_long(32767L)
>>> encode_long(32767)
'\xff\x7f'
>>> encode_long(-256L)
>>> encode_long(-256)
'\x00\xff'
>>> encode_long(-32768L)
>>> encode_long(-32768)
'\x00\x80'
>>> encode_long(-128L)
>>> encode_long(-128)
'\x80'
>>> encode_long(127L)
>>> encode_long(127)
'\x7f'
>>>
"""
@ -1284,7 +1284,7 @@ def encode_long(x):
# Extend to a full byte.
nibbles += 1
nbits = nibbles * 4
x += 1L << nbits
x += 1 << nbits
assert x > 0
ashex = hex(x)
njunkchars = 2 + ashex.endswith('L')
@ -1324,11 +1324,11 @@ def decode_long(data):
nbytes = len(data)
if nbytes == 0:
return 0L
return 0
ashex = _binascii.hexlify(data[::-1])
n = long(ashex, 16) # quadratic time before Python 2.3; linear now
n = int(ashex, 16) # quadratic time before Python 2.3; linear now
if data[-1] >= '\x80':
n -= 1L << (nbytes * 8)
n -= 1 << (nbytes * 8)
return n
# Shorthands