Mercurial > hg
view setup_mpatch_cffi.py @ 30118:c19266edd93e
py3: a second argument to open can't be bytes
This fixes open(filename, 'r'), open(filename, 'w'), etc. calls. In Python
3, that second argument *must* be a string, you can't use bytes.
The fix is the same as used with getattr() (where the second argument must
also always be a string); in the tokenizer, where we detect calls, if there
is something that looks like a call to open (and is not an attribute, so
the previous token is not a "." dot) then make sure that that second
argument is not converted to a `bytes` object instead.
There is some remaining issue where the current transformer will also rewrite
open(f('foo')).
However this also affect function for which we perform similar rewrite
('getattr', 'setattr', 'hasattr', 'safehasattr') and will be dealt with in a
follow up.
author | Martijn Pieters <mjpieters@fb.com> |
---|---|
date | Sun, 09 Oct 2016 14:10:01 +0200 |
parents | 90af59b40d8a |
children |
line wrap: on
line source
from __future__ import absolute_import import cffi import os ffi = cffi.FFI() mpatch_c = os.path.join(os.path.join(os.path.dirname(__file__), 'mercurial', 'mpatch.c')) ffi.set_source("_mpatch_cffi", open(mpatch_c).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()