Mercurial > hg
changeset 43668:53607fd3ec6c stable
cffi: fix build on Python 3
CFFI expects the arguments to be of type str, which means that the string
literals should not have the `b` prefix.
| author | Manuel Jacob <me@manueljacob.de> |
|---|---|
| date | Sun, 17 Nov 2019 19:55:01 +0100 |
| parents | 4cd911040ba5 |
| children | 0f82b29f7494 |
| files | mercurial/cffi/bdiffbuild.py mercurial/cffi/mpatchbuild.py mercurial/cffi/osutilbuild.py |
| diffstat | 3 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/cffi/bdiffbuild.py Sat Nov 16 20:08:35 2019 +0100 +++ b/mercurial/cffi/bdiffbuild.py Sun Nov 17 19:55:01 2019 +0100 @@ -5,10 +5,10 @@ ffi = cffi.FFI() with open( - os.path.join(os.path.join(os.path.dirname(__file__), b'..'), b'bdiff.c') + os.path.join(os.path.join(os.path.dirname(__file__), '..'), 'bdiff.c') ) as f: ffi.set_source( - b"mercurial.cffi._bdiff", f.read(), include_dirs=[b'mercurial'] + "mercurial.cffi._bdiff", f.read(), include_dirs=['mercurial'] ) ffi.cdef( """
--- a/mercurial/cffi/mpatchbuild.py Sat Nov 16 20:08:35 2019 +0100 +++ b/mercurial/cffi/mpatchbuild.py Sun Nov 17 19:55:01 2019 +0100 @@ -5,11 +5,11 @@ ffi = cffi.FFI() mpatch_c = os.path.join( - os.path.join(os.path.dirname(__file__), b'..', b'mpatch.c') + os.path.join(os.path.dirname(__file__), '..', 'mpatch.c') ) with open(mpatch_c) as f: ffi.set_source( - b"mercurial.cffi._mpatch", f.read(), include_dirs=[b"mercurial"] + "mercurial.cffi._mpatch", f.read(), include_dirs=["mercurial"] ) ffi.cdef( """
--- a/mercurial/cffi/osutilbuild.py Sat Nov 16 20:08:35 2019 +0100 +++ b/mercurial/cffi/osutilbuild.py Sun Nov 17 19:55:01 2019 +0100 @@ -4,7 +4,7 @@ ffi = cffi.FFI() ffi.set_source( - b"mercurial.cffi._osutil", + "mercurial.cffi._osutil", """ #include <sys/attr.h> #include <sys/vnode.h> @@ -22,7 +22,7 @@ off_t datalength; } __attribute__((aligned(4), packed)) val_attrs_t; """, - include_dirs=[b'mercurial'], + include_dirs=['mercurial'], ) ffi.cdef( '''