comparison mercurial/pure/base85.py @ 51723:9367571fea21

cext: correct the argument handling of `b85encode()` The type stub indicated that this argument is `Optional`, which implies None is allowed. I don't see in the documentation where that's the case for `i`[1], and trying it in `hg debugshell` resulted in the method failing with a TypeError. I guess it was typed as an `int` argument because the `p` format unit wasn't added until Python 3.3[2]. In any event, 2 clients in core (`pvec` and `obsolete`) call this with no argument supplied, and `mdiff` calls it with True. So I guess we've avoided the None arg case, and when no arg is supplied, it defaults to the 0 initialization of the `pad` variable in C. Since the `p` format unit accepts both `int` and None, as well as `bool`, I'm not bothering to bump the module version- this code is more permissive than it was, in addition to being more correct. Interestingly, when I first imported the `cext` and `pure` methods in the same manner as the previous commit, it dropped the `Optional` part of the argument type when generating `util.pyi`. No idea why. [1] https://docs.python.org/3/c-api/arg.html#numbers [2] https://docs.python.org/3/c-api/arg.html#other-objects
author Matt Harbison <matt_harbison@yahoo.com>
date Sat, 20 Jul 2024 01:55:09 -0400
parents 6000f5b25c9b
children f4733654f144
comparison
equal deleted inserted replaced
51722:43adbe03079b 51723:9367571fea21
21 def _mkb85dec(): 21 def _mkb85dec():
22 for i, c in enumerate(_b85chars): 22 for i, c in enumerate(_b85chars):
23 _b85dec[c] = i 23 _b85dec[c] = i
24 24
25 25
26 def b85encode(text, pad=False): 26 def b85encode(text: bytes, pad: bool = False) -> bytes:
27 """encode text in base85 format""" 27 """encode text in base85 format"""
28 l = len(text) 28 l = len(text)
29 r = l % 4 29 r = l % 4
30 if r: 30 if r:
31 text += b'\0' * (4 - r) 31 text += b'\0' * (4 - r)
48 olen += 1 48 olen += 1
49 olen += l // 4 * 5 49 olen += l // 4 * 5
50 return out[:olen] 50 return out[:olen]
51 51
52 52
53 def b85decode(text): 53 def b85decode(text: bytes) -> bytes:
54 """decode base85-encoded text""" 54 """decode base85-encoded text"""
55 if not _b85dec: 55 if not _b85dec:
56 _mkb85dec() 56 _mkb85dec()
57 57
58 l = len(text) 58 l = len(text)