[pypy-commit] pypy unicode-utf8-py3: Merge py3.5 into branch

2018-08-29 Thread mattip
Author: Matti Picus Branch: unicode-utf8-py3 Changeset: r95040:38112d3a526d Date: 2018-08-29 10:14 +0200 http://bitbucket.org/pypy/pypy/changeset/38112d3a526d/ Log:Merge py3.5 into branch diff --git a/pypy/module/cpyext/cdatetime.py b/pypy/module/cpyext/cdatetime.py --- a/pypy/module/cpyext/

[pypy-commit] pypy py3.5: fix test for py3

2018-08-29 Thread mattip
Author: Matti Picus Branch: py3.5 Changeset: r95039:553bafd3b1ec Date: 2018-08-29 09:47 +0200 http://bitbucket.org/pypy/pypy/changeset/553bafd3b1ec/ Log:fix test for py3 diff --git a/pypy/module/cpyext/test0/test_floatobject.py b/pypy/module/cpyext/test0/test_floatobject.py --- a/pypy/modul

[pypy-commit] pypy unicode-utf8-py3: merge py3.5 into branch

2018-08-29 Thread mattip
Author: Matti Picus Branch: unicode-utf8-py3 Changeset: r95034:d39037807956 Date: 2018-08-28 06:59 +0200 http://bitbucket.org/pypy/pypy/changeset/d39037807956/ Log:merge py3.5 into branch diff --git a/pypy/config/pypyoption.py b/pypy/config/pypyoption.py --- a/pypy/config/pypyoption.py +++ b

[pypy-commit] pypy py3.5: merge default into py3.5

2018-08-29 Thread mattip
Author: Matti Picus Branch: py3.5 Changeset: r95037:c76008be29e5 Date: 2018-08-29 08:17 +0200 http://bitbucket.org/pypy/pypy/changeset/c76008be29e5/ Log:merge default into py3.5 diff --git a/pypy/module/cpyext/cdatetime.py b/pypy/module/cpyext/cdatetime.py --- a/pypy/module/cpyext/cdatetime.

[pypy-commit] pypy py3.5: fix bad automatic merge

2018-08-29 Thread mattip
Author: Matti Picus Branch: py3.5 Changeset: r95038:33943b0827fd Date: 2018-08-29 08:21 +0200 http://bitbucket.org/pypy/pypy/changeset/33943b0827fd/ Log:fix bad automatic merge diff --git a/pypy/module/cpyext/test0/test_abstract.py b/pypy/module/cpyext/test0/test_abstract.py deleted file mo

[pypy-commit] pypy default: ensure datetimeAPI is initialized, for subclassing cpyext classes

2018-08-29 Thread mattip
Author: Matti Picus Branch: Changeset: r95036:d2dd59afa85c Date: 2018-08-29 08:16 +0200 http://bitbucket.org/pypy/pypy/changeset/d2dd59afa85c/ Log:ensure datetimeAPI is initialized, for subclassing cpyext classes diff --git a/pypy/module/cpyext/cdatetime.py b/pypy/module/cpyext/cdatetime.py

[pypy-commit] pypy default: split tests into two directories to speed up parallel testing

2018-08-29 Thread mattip
Author: Matti Picus Branch: Changeset: r95035:943b0266d564 Date: 2018-08-29 08:16 +0200 http://bitbucket.org/pypy/pypy/changeset/943b0266d564/ Log:split tests into two directories to speed up parallel testing diff --git a/pypy/module/cpyext/test0/__init__.py b/pypy/module/cpyext/test0/__in