[pypy-commit] [Git][pypy/pypy][branch/py3.7] 2 commits: fix merge

[Matti Picus (@mattip)]

Matti Picus pushed to branch branch/py3.7 at PyPy / pypy


Commits:
c95713d1 by Matti Picus at 2021-07-27T12:53:52+03:00
fix merge

--HG--
branch : py3.7

- - - - -
dd4ce6eb by Matti Picus at 2021-07-27T12:54:34+03:00
allocate PyUnicodeObject + data when non-compact

--HG--
branch : py3.7

- - - - -


3 changed files:

- pypy/module/_pypyjson/interp_decoder.py
- pypy/module/_pypyjson/test/test__pypyjson.py
- pypy/module/cpyext/unicodeobject.py


View it on Heptapod: https://foss.heptapod.net/pypy/pypy/-/compare/d2f574f3235f40e3c3cf95b4d94bb18cb5b8dd8e...dd4ce6eba965932649962a5ae3519028e7a8c003

-- 
View it on Heptapod: https://foss.heptapod.net/pypy/pypy/-/compare/d2f574f3235f40e3c3cf95b4d94bb18cb5b8dd8e...dd4ce6eba965932649962a5ae3519028e7a8c003
You're receiving this email because of your account on foss.heptapod.net.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://mail.python.org/pipermail/pypy-commit/attachments/20210727/b2369cec/attachment-0001.html>