Mercurial > hg
view mercurial/cffi/mpatchbuild.py @ 49628:f09bc2ed9100 stable
help: fix a py3 error interpolating Set into b'%s'
I can't reproduce it, but a coworker hit this with `hg help -v` with 6.2.3:
...
File "mercurial\help.pyc", line 865, in helplist
TypeError: %b requires a bytes-like object, or an object that implements __bytes__, not 'set'
I can confirm that the original expression fails in `hg debugshell`, and the new
one works. The second instance was found by searching for "%s", but PyCharm
detects a lot of variables as Any type, so I have no idea if there are other
lurking problems.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Sun, 20 Nov 2022 15:55:27 -0500 |
parents | 6000f5b25c9b |
children |
line wrap: on
line source
import cffi import os ffi = cffi.FFI() mpatch_c = os.path.join( os.path.join(os.path.dirname(__file__), '..', 'mpatch.c') ) with open(mpatch_c) as f: ffi.set_source( "mercurial.cffi._mpatch", f.read(), include_dirs=["mercurial"] ) ffi.cdef( """ struct mpatch_frag { int start, end, len; const char *data; }; struct mpatch_flist { struct mpatch_frag *base, *head, *tail; }; extern "Python" struct mpatch_flist* cffi_get_next_item(void*, ssize_t); int mpatch_decode(const char *bin, ssize_t len, struct mpatch_flist** res); ssize_t mpatch_calcsize(size_t len, struct mpatch_flist *l); void mpatch_lfree(struct mpatch_flist *a); static int mpatch_apply(char *buf, const char *orig, size_t len, struct mpatch_flist *l); struct mpatch_flist *mpatch_fold(void *bins, struct mpatch_flist* (*get_next_item)(void*, ssize_t), ssize_t start, ssize_t end); """ ) if __name__ == '__main__': ffi.compile()