Mercurial > hg
view mercurial/cffi/osutilbuild.py @ 49803:55d45d0de4e7
typing: add type hints to pycompat.bytestr
The problem with leaving pytype to its own devices here was that for functions
that returned a bytestr, pytype inferred `Union[bytes, int]`. It now accepts
that it can be treated as plain bytes.
I wasn't able to figure out the arg type for `__getitem__`- `SupportsIndex`
(which PyCharm indicated is how the superclass function is typed) got flagged:
File "/mnt/c/Users/Matt/hg/mercurial/pycompat.py", line 236, in __getitem__:
unsupported operand type(s) for item retrieval: bytestr and SupportsIndex [unsupported-operands]
Function __getitem__ on bytestr expects int
But some caller got flagged when I marked it as `int`.
There's some minor spillover problems elsewhere- pytype doesn't seem to
recognize that `bytes.startswith()` can optionally take a 3rd and 4th arg, so
those few places have the warning disabled. It also flags where the tar API is
being abused, but that would be a tricky refactor (and would require typing
extensions until py3.7 is dropped), so disable those too.
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Wed, 14 Dec 2022 01:51:33 -0500 |
parents | 6000f5b25c9b |
children | f4733654f144 |
line wrap: on
line source
import cffi ffi = cffi.FFI() ffi.set_source( "mercurial.cffi._osutil", """ #include <sys/attr.h> #include <sys/vnode.h> #include <unistd.h> #include <fcntl.h> #include <time.h> typedef struct val_attrs { uint32_t length; attribute_set_t returned; attrreference_t name_info; fsobj_type_t obj_type; struct timespec mtime; uint32_t accessmask; off_t datalength; } __attribute__((aligned(4), packed)) val_attrs_t; """, include_dirs=['mercurial'], ) ffi.cdef( ''' typedef uint32_t attrgroup_t; typedef struct attrlist { uint16_t bitmapcount; /* number of attr. bit sets in list */ uint16_t reserved; /* (to maintain 4-byte alignment) */ attrgroup_t commonattr; /* common attribute group */ attrgroup_t volattr; /* volume attribute group */ attrgroup_t dirattr; /* directory attribute group */ attrgroup_t fileattr; /* file attribute group */ attrgroup_t forkattr; /* fork attribute group */ ...; }; typedef struct attribute_set { ...; } attribute_set_t; typedef struct attrreference { int attr_dataoffset; int attr_length; ...; } attrreference_t; typedef int ... off_t; typedef struct val_attrs { uint32_t length; attribute_set_t returned; attrreference_t name_info; uint32_t obj_type; struct timespec mtime; uint32_t accessmask; off_t datalength; ...; } val_attrs_t; /* the exact layout of the above struct will be figured out during build time */ typedef int ... time_t; typedef struct timespec { time_t tv_sec; ...; }; int getattrlist(const char* path, struct attrlist * attrList, void * attrBuf, size_t attrBufSize, unsigned int options); int getattrlistbulk(int dirfd, struct attrlist * attrList, void * attrBuf, size_t attrBufSize, uint64_t options); #define ATTR_BIT_MAP_COUNT ... #define ATTR_CMN_NAME ... #define ATTR_CMN_OBJTYPE ... #define ATTR_CMN_MODTIME ... #define ATTR_CMN_ACCESSMASK ... #define ATTR_CMN_ERROR ... #define ATTR_CMN_RETURNED_ATTRS ... #define ATTR_FILE_DATALENGTH ... #define VREG ... #define VDIR ... #define VLNK ... #define VBLK ... #define VCHR ... #define VFIFO ... #define VSOCK ... #define S_IFMT ... int open(const char *path, int oflag, int perm); int close(int); #define O_RDONLY ... ''' ) if __name__ == '__main__': ffi.compile()