Author: Armin Rigo
Branch: py3.6
Changeset: r98577:be4941bb07ae
Date: 2020-01-23 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/be4941bb07ae/
Log:hg merge default
diff --git a/pypy/interpreter/test/test_argument.py
b/pypy/interpreter/test/test_argument.py
---
Author: Armin Rigo
Branch: py3.6
Changeset: r98578:73d20edb41e9
Date: 2020-01-23 13:20 +0100
http://bitbucket.org/pypy/pypy/changeset/73d20edb41e9/
Log:hg merge default
diff --git a/pypy/module/_multibytecodec/c_codecs.py
b/pypy/module/_multibytecodec/c_codecs.py
---
Author: Armin Rigo
Branch:
Changeset: r98575:76b34bb85fe5
Date: 2020-01-23 13:07 +0100
http://bitbucket.org/pypy/pypy/changeset/76b34bb85fe5/
Log:Test really just what we want to, i.e. that the message does not
contain the word 'self'
diff --git
Author: Armin Rigo
Branch:
Changeset: r98576:a7c7b4c7dcae
Date: 2020-01-23 13:08 +0100
http://bitbucket.org/pypy/pypy/changeset/a7c7b4c7dcae/
Log:merge heads
diff --git a/pypy/module/_multibytecodec/c_codecs.py
b/pypy/module/_multibytecodec/c_codecs.py
---
Author: Carl Friedrich Bolz-Tereick
Branch: py3.6
Changeset: r98574:deaa30ceb571
Date: 2020-01-23 12:30 +0100
http://bitbucket.org/pypy/pypy/changeset/deaa30ceb571/
Log:fix issue with @pytest.mark.pypy_only
before it would actually crash
diff --git a/pypy/conftest.py
Author: Carl Friedrich Bolz-Tereick
Branch: py3.7
Changeset: r98573:bde40d73c3de
Date: 2020-01-23 12:01 +0100
http://bitbucket.org/pypy/pypy/changeset/bde40d73c3de/
Log:support async generator expressions in normal functions
diff --git a/pypy/interpreter/astcompiler/codegen.py
Author: Armin Rigo
Branch:
Changeset: r98572:fb95321122db
Date: 2020-01-23 11:51 +0100
http://bitbucket.org/pypy/pypy/changeset/fb95321122db/
Log:PyCodec_Encoder(), PyCodec_Decoder()
diff --git a/pypy/module/cpyext/codecs.py b/pypy/module/cpyext/codecs.py
--- a/pypy/module/cpyext/codecs.py
Author: Armin Rigo
Branch:
Changeset: r98571:2ed84f7866b6
Date: 2020-01-23 11:37 +0100
http://bitbucket.org/pypy/pypy/changeset/2ed84f7866b6/
Log:Fix a corner case in multibytecodec: for stateful codecs, when
encoding fails and we use replacement, the replacement string must